From: David Reitter <david.reitter@gmail.com>
Date: Mon, 16 Mar 2009 20:46:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1206
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a10f29395238c9935518259edf7d23cfcad61f13;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4c6d9ada18..7eb520f53b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-16  David Reitter <david.reitter@gmail.com>
+
+	* faces.el (set-face-attributes-from-resources,
+	face-set-after-frame-default): Do not import X resources on NS
+	because NS does not have system-wide X resources.
+
 2009-03-16  Richard M Stallman  <rms@gnu.org>
 
 	* mail/rmail.el (rmail-retry-failure): Discard rmail-ignored-headers.